From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 23 Feb 2015 19:47:56 +0000 (-0500)
Subject: Add explicit zlib dependency
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~908
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=12c8ef14254c634bffe59fa97c1e28c3cc7e930d;p=ostree.git

Add explicit zlib dependency

Needed for CRC32 computations.
---

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 241b91d5..1b265055 100644
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -107,9 +107,9 @@ libostree_1_la_SOURCES += \
 endif
 
 libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libglnx -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree \
-	$(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_DEP_LZMA_CFLAGS)
+	$(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_DEP_LZMA_CFLAGS) $(OT_DEP_ZLIB_CFLAGS)
 libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^ostree_'
-libostree_1_la_LIBADD = libotutil.la libglnx.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_DEP_LZMA_LIBS)
+libostree_1_la_LIBADD = libotutil.la libglnx.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_DEP_LZMA_LIBS) $(OT_DEP_ZLIB_LIBS)
 
 if USE_LIBARCHIVE
 libostree_1_la_CFLAGS += $(OT_DEP_LIBARCHIVE_CFLAGS)
diff --git a/configure.ac b/configure.ac
index 89eaa39e..f6aeb019 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,9 @@ PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
 dnl 5.1.0 is an arbitrary version here
 PKG_CHECK_MODULES(OT_DEP_LZMA, liblzma >= 5.0.5)
 
+dnl Needed for rollsum
+PKG_CHECK_MODULES(OT_DEP_ZLIB, zlib)
+
 dnl We're not actually linking to this, just using the header
 PKG_CHECK_MODULES(OT_DEP_E2P, e2p)